From: Jan Beulich <JBeulich@suse.com>
Date: Fri, 19 Dec 2014 11:17:02 +0000 (+0000)
Subject: EFI: suppress bogus loader warning
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3994
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=926e680aadde774557b92a4a3e9457f63e963e84;p=xen.git

EFI: suppress bogus loader warning

This was accidentally lost in commit fbc3d9a220 ("EFI: add
efi_arch_handle_cmdline() for processing commandline"), leading to the
"Unknown command line option" warning being printed whenever options
get passed to the core hypervisor or the Dom0 kernel.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Release-Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---

diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c
index c68efdb2b5..ac6881ea93 100644
--- a/xen/common/efi/boot.c
+++ b/xen/common/efi/boot.c
@@ -311,6 +311,7 @@ static unsigned int __init get_argv(unsigned int argc, CHAR16 **argv,
                 ++argc;
             else if ( prev && wstrcmp(prev, L"--") == 0 )
             {
+                --argv;
                 if ( options )
                     *options = cmdline;
                 break;